From: Carl Lerche Date: Wed, 19 Mar 2014 21:01:45 +0000 (-0700) Subject: Bugs? X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1129^2~6 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=7da15067e79b1b555f2cbd004c76b0b2537d83ba;p=cargo.git Bugs? --- diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 80fe812c8..2e840da0d 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -1 +1,6 @@ -pub mod process; +//pub use self::process_builder::process; +//mod process_builder; + +pub fn process(cmd: &str) -> &'static str { + "ohai" +} diff --git a/src/cargo/util/process.rs b/src/cargo/util/process.rs deleted file mode 100644 index c62907ea3..000000000 --- a/src/cargo/util/process.rs +++ /dev/null @@ -1,25 +0,0 @@ -use std::os; -use std::io::process::{Process,ProcessConfig,InheritFd}; - -pub struct ProcessBuilder { - program: ~str, - args: ~[~str], - path: ~[~str] -} - -impl ProcessBuilder { - fn args(mut self, arguments: &[~str]) -> ProcessBuilder { - self.args = arguments.clone(); - self - } -} - -pub fn process(cmd: &str) -> ProcessBuilder { - ProcessBuilder { program: cmd.to_owned(), args: ~[], path: get_curr_path() } -} - -fn get_curr_path() -> ~[~str] { - os::getenv("PATH").map(|path| { - path.split(std::path::SEP).collect() - }).or(~[]) -} diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs new file mode 100644 index 000000000..b05359d58 --- /dev/null +++ b/src/cargo/util/process_builder.rs @@ -0,0 +1,26 @@ +use std; +use std::os; +use std::io::process::{Process,ProcessConfig,InheritFd}; + +pub struct ProcessBuilder { + program: ~str, + args: ~[~str], + path: ~[~str] +} + +impl ProcessBuilder { + fn args(mut self, arguments: &[~str]) -> ProcessBuilder { + self.args = arguments.to_owned(); + self + } +} + +pub fn process(cmd: &str) -> ProcessBuilder { + ProcessBuilder { program: cmd.to_owned(), args: ~[], path: get_curr_path() } +} + +fn get_curr_path() -> ~[~str] { + os::getenv("PATH").map(|path| { + path.split(std::path::SEP).map(|seg| seg.to_owned()).collect() + }).unwrap_or(~[]) +}